Added a new Config class and constructor