Updated Mapping method names