Fix details
Start to add the Step handler features [WIP]