CI sygnal - Refactoring, using fascades