Replace shapeMap with shape.entity. Closes #10