Changes to dialog classes