Add JPM support