Add GenericResolveContext. Fix build