[TASK] Partial plugin-less re-implementation