Changes in core to support new spatial libraries