Remove XMapper references
Add a PersonMapper