REFACTOR account_decorator