Add more formats, remove regexp