RMA Refactoring