Validation imrpoved. RDF generation improved