refactor collection(-store) and object(-store)