Added expression keys to distinct and partition operator and addressed some of the comments