Add Simulation before and after hooks, close #1475