Further space optimizations