Added pending switch support