[TASK] Update Plugin with feedback from Afoeder