Try to improve regexes