mapper interface signature refactored