Integrated npid and person models from DDE2 updated versions