Adding --no-fetch option