Made sample_mapper work