Added new db properties
moved DB to main