added flag to enable/disable column & function checking