Move events to controllers