- Added Call conventions and event firing