Refactor to send out Broadcasts events when uploading