DB Store refactored
DB Store refactored 2