Change download class to singleton