Add rest function to support non-hyphenated values