further plugin improvements