App related changes for refactoring