Updated with Person model