Code

Add backwards compatible action handling.