Added events-module