Added to track framework and event handling