Added before step and after step hooks