Added more references to TODO