Refactoring for new action plan