Update to support more sources