Back to original CVL metamodel. Use postprocess hook to complete model after parsing