More fields added, plus an almost complete example package dict