[TASK] Add TODO markers for additional checks