Extending discriminator map with annotation and discriminator map helper