Added comparison and goto arguments