Refactor comfort step
Add step support