Better support for different content formats. Now supports raw loader as well as html loader.