Improve schemas