1.1.11: Raw output of decomposition now optional