Fix IFacade namespace
Refactoring of condition