improved package builder