Added ability to disable auto-loading.