Add more packages, update org to 8.0