Update codes related to function resolving