model parser improvement