Improved plugin inteface