Can we change the value type to String here directly? Then you don't need the extra mapValues