Refactored AppService