Added final fields to form