Fixed regex. New grammar expression added