Improve and fix schema