Move tunnel-identifier to capabilities