small improvements to schema