Added config singleton