[restructuration] : Parametrize everything