Added: Mapper should work
Fixed: 9202a95
Added: Should be able to provide custom mapper
Fixed: 232c144