Further design optimizations