Added ContainerSurface for future clipping