Added schema parsing