Refactored app interfaces