#55: More model parser implementation