Enhance schema template