Improve management of schemas