Add more packages, etc.