Improvements: NOLOCK, COMPUTE, cursor definition