More support for nested decomposition