Added resolving of resource