Added support for hierarchical package representation