Updating class structure