On TODO handled (appropriate mapping filled in)