Updates and optimizations