Add support for specifying spatial index