Changed to use objectId after hash