Added a mapper interface