SemiGeneric improvements