Now creating entries properly per package