Add regex validation to Cmdlet parameters
Update regex and small bug fixes