Configuration support changes