DB Store refactored complete