Add Registration to Events/Finish Commands