Changes in decomposer to support prefixes