Change datafactory logic