Added contraction support