Update includes, prototype for model construction