Package upgrade and code review changes