Adding extended tags for Decombinator