Modify in class structure