Make more config injectable