Made parser smarter