Works now with non-entity shapes.