Add parsing to models

Imrpoves #5