Add some nicer config options
Move into packages