Added am, ns, pm, ps and srv:pm(<7.x)