Made steps more declarative