Add CoreResolver
Use CoreResolver
Use core_resolver