Updates to models and templates