Enhance Schema