Create Database#objectStore and refactor