Added more ranges (weeks, months, years)