Resource Tracker Issue 90