Trying to fix arguments after converting to plugin