FIX reduce the number of regexes