Adding in object id functionality