Modify controller and model for events