Refactoring for the new system with account_to and from