Remove Config class and use class property