Refactored apps