Account class updated