Noted down more TODOs