Tweak the schemas for new line support