+ Refactoring of spatial entities
+ Modified spatial location class names