More refactoring of actions