Added regex to handle create