Made the loader more flexible.