Merging Shriti's changes (DBO Objects)