More refactoring of the actions