Add generic packaging