Updated object design
Merge branch 'oosd_rupesh'