Rework configuration stuff