Preparation for parser remodeling to support the V2 protocol