model and parsing improvements