Moved actions into separate file