Added Editor field
Added in conditions to upload field