Added support for default loader