Refactored app classes