Some changes to packages