[FIX] Updated to conform to the latest gateway services protocol spec