Add surface roles

... and write-locked here.