Made PersonHandler more efficent