Better solution for JPM support