Adds invertSpan etc