Chnages for supporting open generics better