(COMMIT-39) More configuration