Added second map to Util class