Share more code in Resolve