Fixed SF long and changed token type usage