Add configuration objects and better notification message.