Updated Converters to reflect the List to Set change