Fix for discriminator classes and validator parser (required fields, format)