ClassDialog: improved implementation...