Migrating to new package