Added event and basic functions