Refactoring Interfaces EntityContext IndexAO