Updated with source federation