Bug fixes. Add support for loader methods.