Add context.surface property