Update todo list with gh-391