Update RebuildViaHook to accept different param format