Added SQL support. Autocomplete imroved