Add todos for types