schema.sql improvement