ObjectStore refactoring