Added support for plus-operator and choice of lookup Identifiers or not.