Added new fields to User table.
Modified template.