Moved actions into a separate file