Add support for a bunch more packages.