Added more configuration options and packages.