reintroduced EntityBase, added FindX for query