Add --image support