FIX: Lower memory usage