Furter parser improvements