Added Converter and struct