Changed Gateway plugin argument handling