Added generic packaging.