Plugin enhancement