DOC EntityCollection improved