Added id field to the ctf_type
Added an important TODO