Converted download hack into proper plugin