Added more classes for objects

Change-Id: I85442711fdd0aae0d967c00da17de926b632fe70