Added config class
Fixed config