Better handling of existing repo