Update to handle dashes