Added additional regex