Many updates to align the LPGeneric change.