Sources are now returned as objects