Removed private scope
Added more event stubs