Feature/polling upload enhancement

Testing in progress.