Better database creation