Added alphanumeric checks