Added additional functions and events