Added data sources, waiting on Sword to be fixed