Fixed support for GenericDefs