Changed keySet to stringKeySet for CH builds 2636 and higher