Finished adding structured model stuff