Adapted converters to newer format.