Added support for package keywords