Bugfixing and refactoring after changing infrastructure facades instantiation methods