Updated Events and Bind modules