Update TODO
Refactor: do more correct namespace