Add configuration system
Remove line