Oops, thought you were commenting on the line below at first. Yes, I agree that the AccountManager instance could be moved to Setup.