Initial work for step refactoring