+ Refactoring of spatial entities