Some major refactoring and improvements to the action (set) execution mechanism