Improve decomposition