Added custom type resolvers and custom value resolvers