Update and map methods with proper wrapping.