Update getter methods to return existing objects instead of fresh ones