Improved default types
Trying to get replace --yes working