Updated to include all packages and templates.