Major improvements to APIDataFactory and added the beginning for events and better browsing