Added option to map hints and values individually