Plugin compatibility improved