Client App refactored