Unified entity

See discussion [here](https://github.com/soliantconsulting/SimpleFM_FMServer_Sample/issues/4)