Changed from 'Shape' to more general 'Painter'