Added regex digit and alphanumeric checking