Add URL plugins
Switch to entity_metadata_wrapper()
Improve external reference handling