Added support for hierarchy in symbol list, bug fixes