Make uploader and upload_date fields optional
Add location field
RBMA IE (Closes #630)