Migration to Jersey 2