[TASK] Finish up Plugin implementation