Rework to follow configuration file driven setup