Refactor object store delegates