Add modular_action.
Refactoring
Refractoring