Modified Account Class