Started fixing issue regarding database initialization