Improved plugin and functionality