Added code for switch cdp parsing