added support for loader