Change account to be a property