Make schemas less dependent on other files