Design & performance improvements