Add surface roles

What about merging this into the upper one?

At least the doubled blank line above should be removed.