Refactor AE and Request