Added proper dependency for value-mapper