Further refactoring of actions