Updated wrapper classes to use new method names and added PersonWrapper