entity: added support for association