Final tweak to schema and update models