Added support for the generation of characterisation components