Updating regex to support dashes