Added schema parser