Added Conent Preparer
Updated ContentLoader