Fix: Create each table with keys and constraints in one go