Add some options in the TODO list