Changed HashMaps to EnumMaps in proxy services