Modified some packages choices