slight tweaks to schema