Improved hyper plugin