Additional changes for SGF-160