Fix package integration