renamed simple_shape to geometry and metadata to properties