[TASK] Add some speedup