Wiring up events for new class based approach