Events added and library issue fixed