Changes to add delegate.