Add support for numeric groups