Updated; Move Mapper interface to top level