Added event and logger part