Add TODO condition statements