changes to reduce time taken for calculating generated column values