Improvements for Delegate Module