Add support for resolveAndApply