More configuration work