Move data parsing into Model