Updated the Validator to handle extra entities, as is commonly done in Publican.