Further refactoring of the actions systems