Application Owner refactoring