Updated server and account class