Updated Account for better compatibility with Auth class.