Added switch logic to AlphaExtract