Add more regex, because regex

Implement a few new formats