Add configuration option
Add cleanup command