Added Criterium dev dependency for benchmarking
Improved performance of map-keys and map-vals