Parametrized the management systems in infrastructure

Fixes #181