Modify download implementation