Target identification classes have now the same structure as plot classes.