Updated Converter Class