Handling of Boundary Events added