Made federation upstream and policy creation work