Minor changes for existing classes