More changes for newer class interface