Thanks for the feedback. How about changing the "CommonAcpiTimerLib.*" to "DxeMmAcpiTimerLib.*" to cover Dxe/Smm and StandaloneMM instances? I will update the BASE NAME to StandaloneMmAcpiTimerLib in v3. Regards, Kun