Upload changes to handle better AFNetworking framework operations