Enum added and multiple config tag support