Moved TODOs in modules