improved FacadeExtension