add account class, refining structure