Improve schemas population