Update schema parser to track children