add support for fill switch