Add new config class and remove all static configs