Further dev on Database setup functionality