Add more config options. TODO: Cleanup