Minor updates optimization