Updated Database setup #1