More mods to schema