Moved OUW state handling to ObjectTracker class