Added config wrapper
Fixed config calls