Load with q support.
Added support for loading with a query.