Facade update

Update for Facade support (and typo fix)