More changes to interface