More parameteralizing

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>
Yet even more parameteralizing

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>