Edit docblock; Allow EntityInterface for