Add support for variable configuration