Number of variant dependant code change so all changes can be done only in xform Test mode for new variant added