fix: Use tuples instead of lists, to avoid conversion

fix: Use tuples instead of lists, to avoid conversion #940