Ok. I will also modify deprecated class.... And use an interface IModal (to mar both ModalWithFom and Modal).