Adding support for local image download, better disk management, etc.