CTF - Draft structure update.