refactoring - exceptions
All properties that were of type Map<String, String> changed to Map<String, Object>