Connector adaptation to meta changes. Refactor critical, blocked and major code of sonar