Updated templates to work with new models