Adding support for Masque as well as ButtonFacade