Upgrade TODO items