Made config smarter with default values