Register axon waypoint is performed on every step
Replaced Contract implementation (performance improvment)