Added proper interface to grab events