Added more TODO items