Removed ActionType enum dependency (Working toward more abstraction on the actions)