Add missing refactoring steps