Added entry reference to string fields to enable validation