Clarify function and replacing default resolver