Add a couple configuration options for later