Added ResourceTracker (finally)