Overall plugin improvements