Updated object trigger events
Merged some files