Added simple SELECT and WHERE handling