Refactored plugin to make use of the Converter