even further schema changes