One step further to get manual SQL to work