Added more regular expressions