Add changes from SS7