Added and cleaned up action constructors