Added more TODO issues