Enhance schema definition