Updated todo for future versions