Update for Jersey-2