Added structural classes