added support for generic (not only NE) entities