Readded 'decompose' wrapper