Plugin Methods and Events enhanced