Added uploader event emitters and rebuild