Added support for entity instance ids and entity properties.

FE-26
FE-27