OPAL-2142 Identifiers generation added