Upgraded solution to latest package versions