Upgrading to Nice Switch in APEX 19