MODE-1773 Made the projection expressions more general