Major plugin revision