Possibly added support for different plugin locations.