Added more functionality to the converters