review feedback; added back in a completer for ObjectStore