Added better capabilities for todo list handling