add more types
correct regex