Updated references - Added event handlers