I changed `Geometry` to require an `attributes` parameter. This should be fine as long as `geometry` is of type `Geometry`.