Refactor XHContact model.