Changed regex data structure