Adaptation of connector to the new Meta change, and refactor of code