Made parser a bit better in terms of matching.