Added Mapper:NullMapper for testing purposes