TypeTodo made both st2/st3 compatible