Added new fields to store on server side