Added mappings for DrawSurface and Surface.