Fix to allow discriminatorColumn to be on the composite key