Got rid of todo, however, still need to implement on entity side