Added OpenSpatial stuff