[FIX] Updated Function calls to new arguments