REFACTOR db properties