Added select and where expression parsing and generating