handle GenericReferenceField well + organize imports