Added extra Fields
Fixed Download