Updated dependency management
Added generic values in conf files