Conversion to plugin