Changed to map based values
2.0.0