Finalize new configuration
Refactor commands to use the new configuration