Add missing packages, change versions & add resolution optional