[TASK] Rewrite of the whole extension