Added fieldpack_switch support