added user classes, pls review