Design update and performance improvements