Handled more TODO items