Applied the new AutoPlugin functionality and also merged the object/class - the class wasn't required