Incorporating Safety-II in future gas systems