Better handling of internal and external entity definition files
Entity definition file managegement