Update with DialogControl modifications