Refactoring, continue connections between roles, ports and services