Implement more event wiring