Improve models and parsers