Now with more configury goodness