Added helper for mapping Map<String, String>