Added support for Map<String, Object>