Made some updates to classes in preparation for implementation of
upgrades.