Improved plugin