* Adjusted regex to accept more patterns