Added feature to include alt url.
Consolidated datasource for easier testing.