Added support for dynamic content resolvers and minor fixes