Shouldn't this be brought by configuration as well?