Add ConverterBuilder interface and lean on that, rather than concrete class