Migrating to eclipse link