Changed config overrides to use ImmutableList