Added Sast functions and fixing expressions