Tables in database schema finalized