Got it working for @ReferenceOne without discriminatorMap; moving to ironing the tests out