Made parser type safe