Updated template and added some fields