[CORE-82] Updating wrapper
[CORE-47] Improved upload
[CORE-82] Updating wrapper pt 2
[CORE-91] Updating comments