fix: some datasink changes