♻️ Make delegate respect generic types as much as possible

♻️ Make delegate respect generic types as much as possible #529