added new data-mapper interface