+ Changed MethodWrapper to Map