Misc step manager refactoring