WithEntity -> WithContent