Fixed bug with model identification, added parsing function