Moved actions to separate controller class