Use new source format