ACTIONS definitions refactored