Add support for Schema - Introduced by RFP