Refacto JM client