Delegate reflection updated

Updated version of PR #501.