Added attribute resolvers