Update to base for Database setup.
New Solution #1
Solution #2