Allow horizontal tree
Refactored parsing of decomposition data