Improve todo and define new milestone