TODO is in EntityApi as well, so can delete it from here I think.