Added support for hierarchical id names.