[AM] Refactoring