Added check and changed autoloading.