Improvements to the ARC support with the delegate.