Add support (warning) for calculated columns