Updated download functions