SDV-441 Added classes to discriminator map
SDV-213 Updated input filter type