Add more values for intermediate and long