Comprehensive code update