refactor action map