Adding TODO comment on this model