Restructure update methods to enhance performance