Updated parsing in call