More changes to support remote layers