Updated model per PEP