Updated the classes to only use api.Event rather than Schedule(r)