Added module support to todo list