Add core option to switch out L and Z