[TASK] Optimizations