Add apm support