[FIX] Optimizations