Add print-hierarchy and print-var