Added interfaces for the mapper.