OCSADV-27 Separate model and parser into two files #time 10m