Models and templates updated