Added Converter logic