More changes to declarations