Update to use BasicSource