Added some new event and changed referencing to object ref.