Finished up model parsing