Refactored to simplify and use `varsy/configurator`