Need more access to X macro and enum