Modularizing a bit the configuration