Added ScoredSource and other stuff