class structure updated