Feature/package upgrades