added class structure