Adding support for objects to loc

Change-Id: Ibc687d96b9a9ea38500eb9c377599b362602dcb0