Added support for action execution
Cleaned up branch