Made changes to database setup process
Database setup process fix