Moved getObjectStore to mirror execution order