adding new models and fixing parsing