Use built in MutableMap.Builder method to prevent null values