modified schema parsing