Added modules to TODO list