Feature #907 : refactoring actions