Moved actions to utilities