Added initial version of action handling