GDA-5531 add types to classes using generic interface