Add configuration
Some changes