Update getter methods and other changes