Refactor Spatial