Changes in class structure