More structure. PYP, LM, CRP, ...