Add configuration option. Add more tests.