Make more stuff configurable