Added some plugin stuff