Template changes
Added and qualified model fields