Added config and modifications for config