New events for API and Fixes