database schema to the new one corrected