Issue #2240:add contract related columns