Adding Support for Non-spatial Entities