Fix ordering issue, changing from dictionary type to tuple