add queuing of single record. Improve non-sql support