V2.0 of class structure