Internal refactor, StepsAction and NewStateAction for triggers