Some changes in order to improve deployment on interconnected scenarios