Support for more types of todo