update all schemas to use the core model and base
merging