Updated unit regex