Some navigation changes and added new events API classes