Change return type

Change return type to use Step Class