Further updates to Package Manager components