Applied Gson patch and added Gson converters for List and Map.