Added event handler methods