Roger. I refactored so that this is now a HashMap<String, String>. The loading code will still use the Properties object to parse the file, no sense re-writing all of that code, then load it into the hashmap. Is that alright?