adding many structural classes