Changed database creation SQL Statements

Fixed previous issues