Add TODOs for the additional checks we need for better Detection