added regex for all types