Fix FQCN and add other Converters